Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix: fix the Raft NPE issue caused by two-phase concurrency #7005

Merged
merged 9 commits into from
Nov 18, 2024
Merged

bugfix: fix the Raft NPE issue caused by two-phase concurrency #7005

merged 9 commits into from
Nov 18, 2024

Conversation

funky-eyes
Copy link
Contributor

@funky-eyes funky-eyes commented Nov 15, 2024 •
edited
Loading

  • I have registered the PR changes.

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

fixes #7004

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@funky-eyes funky-eyes added type: bug Category issues or prs related to bug. module/server server module labels Nov 15, 2024
@funky-eyes funky-eyes added this to the 2.3.0 milestone Nov 15, 2024
@codecov Codecov
Copy link

codecov bot commented Nov 15, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 27.58621% with 21 lines in your changes missing coverage. Please review.

Project coverage is 52.60%. Comparing base (dbe095a) to head (652a7f2).
Report is 1 commits behind head on 2.x.

Files with missing lines Patch % Lines
...aft/execute/branch/UpdateBranchSessionExecute.java 28.57% 8 Missing and 2 partials ⚠️
...r/raft/execute/branch/AddBranchSessionExecute.java 28.57% 4 Missing and 1 partial ⚠️
...er/raft/execute/lock/BranchReleaseLockExecute.java 28.57% 4 Missing and 1 partial ⚠️
...e/seata/server/session/SessionStatusValidator.java 0.00% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##                2.x    #7005      +/-   ##
============================================
- Coverage     52.61%   52.60%   -0.02%     
- Complexity     6579     6580       +1     
============================================
  Files          1126     1126              
  Lines         39928    39953      +25     
  Branches       4680     4690      +10     
============================================
+ Hits          21010    21019       +9     
- Misses        16916    16930      +14     
- Partials       2002     2004       +2
Files with missing lines Coverage Δ
...e/seata/server/session/SessionStatusValidator.java 46.66% <0.00%> (-3.34%) ⬇️
...r/raft/execute/branch/AddBranchSessionExecute.java 55.55% <28.57%> (-19.45%) ⬇️
...er/raft/execute/lock/BranchReleaseLockExecute.java 40.00% <28.57%> (-15.56%) ⬇️
...aft/execute/branch/UpdateBranchSessionExecute.java 45.45% <28.57%> (-34.55%) ⬇️

... and 2 files with indirect coverage changes

@funky-eyes funky-eyes changed the title bugfix: fix the two-phase concurrency issue during commit or rollback bugfix: fix the Raft NPE issue caused by two-phase concurrency Nov 18, 2024
slievrly
slievrly approved these changes Nov 18, 2024
View reviewed changes
Copy link
Member

@slievrly slievrly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@slievrly slievrly merged commit 0a21dea into apache:2.x Nov 18, 2024
5 checks passed
@funky-eyes funky-eyes mentioned this pull request Nov 18, 2024
Open
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slievrly slievrly slievrly approved these changes

Assignees
No one assigned
Labels
module/server server module store: raft type: bug Category issues or prs related to bug.
Projects
None yet
Milestone
2.3.0
Development

Successfully merging this pull request may close these issues.

file&raft doGlobalRollback and doGlobalCommit may have concurrency issues with retry tasks
2 participants
@funky-eyes @slievrly